Перенос Drones & SpaceSEC #200

Lonkuk · 2024-08-07T17:03:07Z

Проверки

PR полностью завершён и мне не нужна помощь чтобы его закончить.
Я внимательно просмотрел все свои изменения и багов в них не нашёл.
Я запускал локальный сервер со своими изменениями и всё протестировал.
Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

no cl

github-actions · 2024-08-07T17:03:50Z

RSI Diff Bot; head commit b604abf merging into 9045fbf
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Back/ertleader_cyb.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Ears/Headsets/space_sec_headset.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added

Resources/Textures/ADT/Clothing/Ears/Headsets/space_sec_headset_full.rsi

State	Old	New	Status
equipped-EARS			Added
icon			Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_commander_hardsuithead.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_officer_hardsuithead.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added

Resources/Textures/ADT/Clothing/Head/Hardsuits/space_sec_pilot_hardsuithead.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added

Resources/Textures/ADT/Clothing/Neck/space_sec_token.rsi

State	Old	New	Status
equipped-NECK			Added
icon			Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_commander_hardsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_officer_hardsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/space_sec_pilot_hardsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_cadet.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_commander.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_officer.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_pilot.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/space_sec_service.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/ADT/Interface/Misc/space_sec_icons.rsi

State	Old	New	Status
ADTSpaceSecCadetStatusIcon			Added
ADTSpaceSecCommanderStatusIcon			Added
ADTSpaceSecOfficerStatusIcon			Added
ADTSpaceSecPilotStatusIcon			Added
ADTSpaceSecServiceStatusIcon			Added

Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/drone-charger.rsi

State	Old	New	Status
chargedrone			Added
chargeshell			Added
l_hand			Added
r_hand			Added

Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/drone-engineer.rsi

State	Old	New	Status
engdrone			Added
engshell			Added
l_hand			Added
r_hand			Added

Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/drone-ipc-soldier.rsi

State	Old	New	Status
ipc_full			Added
ipc_icon			Added

Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/drone-miner.rsi

State	Old	New	Status
l_hand			Added
minedrone			Added
mineshell			Added
r_hand			Added

Resources/Textures/ADT/Objects/Misc/id_cards.rsi

State	Old	New	Status
id-spacesec-cadet			Added
id-spacesec-commander			Added
id-spacesec-officer			Added
id-spacesec-pilot			Added
id-spacesec-service			Added

Resources/Textures/ADT/Objects/Specific/drone-core-advanced.rsi

State	Old	New	Status
drone-core-advanced			Added

Resources/Textures/ADT/Objects/Specific/drone-core-basic.rsi

State	Old	New	Status
drone-core-basic			Added

Resources/Textures/ADT/Objects/Specific/drone-core-command.rsi

State	Old	New	Status
drone-core-command			Added

Resources/Textures/ADT/Objects/Specific/drone-core-elite.rsi

State	Old	New	Status
drone-core-elite			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec_shuttle.rsi

State	Old	New	Status
assembly			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
welded			Added

Resources/Textures/ADT/Structures/Doors/Airlocks/Standard/space_sec.rsi

State	Old	New	Status
assembly			Added
bolted_open_unlit			Added
bolted_unlit			Added
closed			Added
closed_unlit			Added
closing			Added
closing_unlit			Added
deny_unlit			Added
emergency_open_unlit			Added
emergency_unlit			Added
open			Added
open_unlit			Added
opening			Added
opening_unlit			Added
panel_closed			Added
panel_closing			Added
panel_open			Added
panel_opening			Added
sparks			Added
sparks_broken			Added
sparks_damaged			Added
sparks_open			Added
welded			Added

Resources/Textures/ADT/Structures/Machines/space_sec_computer.rsi

State	Old	New	Status
id			Added

Resources/Textures/ADT/Structures/Wallmounts/signs.rsi

State	Old	New	Status
poster_spacesec			Added

Resources/Textures/ADT/Structures/Walls/space_sec_diagonal.rsi

State	Old	New	Status
state0			Added
state1			Added

Resources/Textures/ADT/Structures/Walls/space_sec_wall.rsi

State	Old	New	Status
full			Added
state0			Added
state1			Added
state2			Added
state3			Added
state4			Added
state5			Added
state6			Added
state7			Added

Resources/Textures/ADT/Structures/Windows/space_sec_diagonal.rsi

State	Old	New	Status
state0			Added
state1			Added

Resources/Textures/ADT/Structures/Windows/space_sec_window.rsi

State	Old	New	Status
full			Added
swindow0			Added
swindow1			Added
swindow2			Added
swindow3			Added
swindow4			Added
swindow5			Added
swindow6			Added
swindow7			Added

Edit: diff updated after b604abf

Bolper

Resources/Prototypes/ADT/Drones/Drone-Antags/ перенести в Resources/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/
Resources/Prototypes/ADT/KD/Channels/Channels/DroneAntagChannel.yml перенести в Resources/Prototypes/ADT/radio_channels.yml + убрать русский язык
Resources/Prototypes/ADT/KD/Channels/keys/DroneAntagKey.yml перенести в Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml + убрать русский язык
Resources/Prototypes/name_identifier_groups.yml перенести в Resources/Prototypes/ADT/name_identifier_groups.yml
Resources/Textures/ADT/Mobs/Silicon/AntagDrones/ перенести в Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/

* Добавление основных прототипов SPACE SEC * fixes * changes syndicate and nanotrazen fractions * fixes_2 * Fix ai_factions.yml * Fix Locale/ru-RU/ --------- Co-authored-by: Schrödinger <[email protected]>

Lonkuk · 2024-08-07T20:15:56Z

Это пиздец

Bolper

Стало лучше. Не буду именно запрашивать изменния, ибо уезжаю и проверить времени скорей всего не будет.

Resources/Locale/ru-RU/ADT/access/SpaceSec.ftl

Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/humanoid.ftl

Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Walls/space_sec_walls.ftl

Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Windows/space_sec_window.ftl

Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuit.yml

Resources/Prototypes/ADT/Entities/Structures/Windows/space_sec_window.yml

Resources/Prototypes/ADT/StatusEffects/job.yml

Resources/Prototypes/ADT/ai_faction.yml

Bolper · 2024-08-09T10:08:02Z

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec_shuttle.rsi/meta.json

+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90, modified by brainfood1183 (github), modified by Lonkuk (github)",


Я в этом коммите вижу только html и yml файлы. Откуда pngшки?

Png из Resources\Textures\Structures\Doors\Airlocks\Glass\shuttle_syndicate.rsi тупо перекрашенный и мета от туда же + дописал "modified by Lonkuk (github)", где png в том коммите я без понятия

Bolper · 2024-08-09T10:15:57Z

Resources/Textures/ADT/Objects/Misc/space_sec_ids.rsi/meta.json

У меня очень большое ощущение, что это и все сопутсвующие файлы должны быть в Resources/Textures/ADT/Interface/Misc/space_sec_ids.rsi

В ADT/Interface/ текстуры икон для визора, а в ADT/Objects текстуры для айди карт. Всё лежит на правильных местах.

github-actions · 2024-08-09T21:19:39Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Schrodinger71 · 2024-08-10T08:45:26Z

Жесть тут работа кипит

1Stepka1 · 2024-08-10T18:18:52Z

После изменений запрашиваемых от @Bolper я посмотрю что тут такое

…nto Drone

1Stepka1

Изначально я думал тут будет меньше, потом больше
Но вышло нормально учитывая какой щиткод был в прошлом,есть над чем поработать

Resources/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/DroneAntag_Body.yml

Resources/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/DroneAntag_Core.yml

...s/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/DroneAntag_InventoryTemplate.yml

Resources/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/DroneAntag_Spawner.yml

Resources/Prototypes/ADT/Entities/Mobs/Silicons/Drones/Drone-Antags/DroneAntag_StartingGear.yml

Resources/Prototypes/ADT/Entities/Objects/Device/encryption_keys.yml

Resources/Textures/ADT/Mobs/Silicon/Drones/AntagDrones/drone-core-advanced.rsi/meta.json

Resources/Textures/ADT/Objects/Misc/space_sec_ids.rsi/default-inhand-left.png

Resources/Textures/ADT/Structures/Doors/Airlocks/Glass/space_sec_shuttle.rsi/meta.json

Resources/Textures/ADT/Structures/Wallmounts/space_sec_poster.rsi/meta.json

Bolper · 2024-08-13T15:58:09Z

Пиздец меня Стёпка в говно опустил. Ужас

…nto Drone

Lonkuk · 2024-08-14T19:18:19Z

Всё сделано, всё переделано.

1Stepka1 · 2024-08-15T19:12:00Z

Такс проверю все сейчас
И да если что можешь спокойно упоминать меня в дискорде

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuits-helmets.ftl

Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Doors/Airlock/airlock.ftl

исправлено

1Stepka1

Докрутятся тесты можешь мерджить

исправлено

**Проверки**  - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. no cl --------- Co-authored-by: eddiedoesGIT <[email protected]> Co-authored-by: Schrödinger <[email protected]> Co-authored-by: Darki255 <[email protected]>

jungarikjan and others added 12 commits August 7, 2024 18:30

Дроны-антагонисты (ПОМОГИТЕ УМОЛЯЮ)

e86db86

Фикс спрайтов дронов (всё ещё не то, что нужно)

af8325e

ТРЕТЬЯ ПОПЫТКА ДРОНЫ-АНТАГИ (БЕЗУСПЕШНО)

49b0dd8

Исправление ошибок, успех

04d6604

Спавнер дрона-антага КПБ

962a8a2

Фикс канала связи дронов-антагов

4392888

Fix YAML Validator

9977da6

Фикс цен у дронов

e814911

Ставим пробную цену КПБ антагу

5a40f1d

Update DroneAntag.yml

75ab831

Update DroneAntag_IPC.yml

0b4ed5c

fix drones

6629bae

github-actions bot added Changes: Sprites Изменение спрайтов No C# labels Aug 7, 2024

1Stepka1 requested review from 1Stepka1 and Schrodinger71 August 7, 2024 17:31

github-actions bot added the Status: Needs Review label Aug 7, 2024

1Stepka1 removed their request for review August 7, 2024 17:33

fix drones x2

0c94de1

1Stepka1 requested a review from Bolper August 7, 2024 17:34

fix drones x3

9d92f2e

Bolper reviewed Aug 7, 2024

View reviewed changes

Lonkuk and others added 3 commits August 7, 2024 22:27

fix humanoid.yml bug?

0cdc61c

update humanoid.yml

d9c4b70

github-actions bot added the Changes: Localization Изменение локализации label Aug 7, 2024

Lonkuk self-assigned this Aug 7, 2024

Lonkuk linked an issue Aug 7, 2024 that may be closed by this pull request

SpaceSec перенести большую обнову для ивента #106

Closed

Bolper reviewed Aug 9, 2024

View reviewed changes

github-actions bot added the Merge Conflict label Aug 9, 2024

Schrodinger71 requested a review from 1Stepka1 August 10, 2024 10:42

Lonkuk added 3 commits August 10, 2024 23:48

review fixes

5822910

Merge branch 'Drone' of https://github.com/Lonkuk/space_station_ADT i…

88e810c

…nto Drone

Merge branch 'master' into Drone

e4080d2

github-actions bot removed the Merge Conflict label Aug 10, 2024

1Stepka1 requested changes Aug 13, 2024

View reviewed changes

Lonkuk and others added 5 commits August 14, 2024 02:58

Merge branch 'AdventureTimeSS14:master' into Drone

e196295

stepka fixes

1c49d57

Merge branch 'AdventureTimeSS14:master' into Drone

b01ce32

try fix tests

5b9b777

Merge branch 'Drone' of https://github.com/Lonkuk/space_station_ADT i…

c42abf0

…nto Drone

Lonkuk linked an issue Aug 14, 2024 that may be closed by this pull request

Перенос дронов Антагов для ивента Ильи #194

Closed

1Stepka1 previously requested changes Aug 15, 2024

View reviewed changes

Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuits-helmets.ftl Outdated Show resolved Hide resolved

Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Doors/Airlock/airlock.ftl Outdated Show resolved Hide resolved

помогаем незеру

b604abf

1Stepka1 approved these changes Aug 17, 2024

View reviewed changes

Darkiich added this pull request to the merge queue Aug 17, 2024

Merged via the queue into AdventureTimeSS14:master with commit d597a79 Aug 17, 2024
15 checks passed

Lonkuk deleted the Drone branch August 22, 2024 12:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Перенос Drones & SpaceSEC #200

Перенос Drones & SpaceSEC #200

Lonkuk commented Aug 7, 2024 •

edited

Loading

github-actions bot commented Aug 7, 2024 •

edited

Loading

Bolper left a comment

Lonkuk commented Aug 7, 2024 •

edited

Loading

Bolper left a comment

Bolper Aug 9, 2024

Lonkuk Aug 10, 2024

Bolper Aug 9, 2024

Lonkuk Aug 10, 2024

github-actions bot commented Aug 9, 2024

Schrodinger71 commented Aug 10, 2024

1Stepka1 commented Aug 10, 2024

1Stepka1 left a comment

Bolper commented Aug 13, 2024

Lonkuk commented Aug 14, 2024

1Stepka1 commented Aug 15, 2024 •

edited

Loading

1Stepka1 left a comment

Перенос Drones & SpaceSEC #200

Перенос Drones & SpaceSEC #200

Conversation

Lonkuk commented Aug 7, 2024 • edited Loading

github-actions bot commented Aug 7, 2024 • edited Loading

Bolper left a comment

Choose a reason for hiding this comment

Lonkuk commented Aug 7, 2024 • edited Loading

Bolper left a comment

Choose a reason for hiding this comment

Bolper Aug 9, 2024

Choose a reason for hiding this comment

Lonkuk Aug 10, 2024

Choose a reason for hiding this comment

Bolper Aug 9, 2024

Choose a reason for hiding this comment

Lonkuk Aug 10, 2024

Choose a reason for hiding this comment

github-actions bot commented Aug 9, 2024

Schrodinger71 commented Aug 10, 2024

1Stepka1 commented Aug 10, 2024

1Stepka1 left a comment

Choose a reason for hiding this comment

Bolper commented Aug 13, 2024

Lonkuk commented Aug 14, 2024

1Stepka1 commented Aug 15, 2024 • edited Loading

1Stepka1 left a comment

Choose a reason for hiding this comment

Lonkuk commented Aug 7, 2024 •

edited

Loading

github-actions bot commented Aug 7, 2024 •

edited

Loading

Lonkuk commented Aug 7, 2024 •

edited

Loading

1Stepka1 commented Aug 15, 2024 •

edited

Loading